Increase the static constant default number of loopback interfaces, nloopbacks,

to 8.  These interfaces are very cheap, so there's no problem having a few
spare.  Anyone with more than 8 NICs can still use the kernel command line or
the module parameter line to pass a larger limit to this module.

Detail the kernel command line parameter for nloopbacks in the diagnostic in
network-bridge.

Closes bug #381.

Signed-off-by: Ewan Mellor <ewan@xensource.com>

diff --git a/linux-2.6-xen-sparse/drivers/xen/netback/loopback.c b/linux-2.6-xen-sparse/drivers/xen/netback/loopback.c
index 9845ba32cc644dcf5ef3ddfa9ed5fb86da3b2901..9d6adaa56bf066d797dfa3e375a606a376aaab89 100644 (file)
--- a/linux-2.6-xen-sparse/drivers/xen/netback/loopback.c
+++ b/linux-2.6-xen-sparse/drivers/xen/netback/loopback.c
@@ -29,7 +29,7 @@
 #include <linux/skbuff.h>
 #include <net/dst.h>
 
-static int nloopbacks = 1;
+static int nloopbacks = 8;
 module_param(nloopbacks, int, 0);
 MODULE_PARM_DESC(nloopbacks, "Number of netback-loopback devices to create");
 

diff --git a/tools/examples/network-bridge b/tools/examples/network-bridge
index 5324e8d934828d99b5c7e902251f03b80c218e8c..98a89ff4580ae7ec8b62f6a770202f3342919aa9 100755 (executable)
--- a/tools/examples/network-bridge
+++ b/tools/examples/network-bridge
@@ -200,7 +200,9 @@ op_start () {
 Link $vdev is missing.
 This may be because you have reached the limit of the number of interfaces
 that the loopback driver supports.  If the loopback driver is a module, you
-may raise this limit by passing it as a parameter (nloopbacks=<N>).
+may raise this limit by passing it as a parameter (nloopbacks=<N>); if the
+driver is compiled statically into the kernel, then you may set the parameter
+using loopback.nloopbacks=<N> on the domain 0 kernel command line.
 " >&2
         exit 1
     fi